home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
FishMarket 1.0
/
FishMarket v1.0.iso
/
fishies
/
326-350
/
disk_334
/
fbm
/
fbm-0.9.zoo
/
diff-0.94-0.9a
< prev
next >
Wrap
Text File
|
1990-03-03
|
29KB
|
1,004 lines
diff -c -r fbm/Features ami/Features
*** fbm/Features Sat Mar 3 18:37:02 1990
--- ami/Features Wed Mar 29 13:33:26 1989
***************
*** 2,8 ****
* Announcing the "Fuzzy PixMap" (or FBM) image manipulation library *
************************************************************************
! Current version 0.94
The FBM library is now available in Beta test form to interested
parties. This package allows manipulation and conversion of a variety
--- 2,8 ----
* Announcing the "Fuzzy PixMap" (or FBM) image manipulation library *
************************************************************************
! Current version 0.9
The FBM library is now available in Beta test form to interested
parties. This package allows manipulation and conversion of a variety
***************
*** 61,75 ****
With input converter for
o raw images (like Amiga Digi-View files)
- o Targa By Ian MacPhedran
- o PIC By Ian MacPhedran
- o QRT By Butler Hines
With output converters for
o PostScript (1bit or 8bit grayscale files only)
o Diablo graphics (1bit files only)
- o Targa By Ian MacPhedran
Operations
--- 61,71 ----
Only in fbm: MANIFEST
Only in fbm: Makefile
Only in ami: Makefile.unix
Only in ami: README.amiga
Only in ami: abort.c
Only in fbm: clr2gray.1
Only in fbm: fbcat.1
Only in fbm: fbclean.1
Only in fbm: fbedge.1
Only in fbm: fbext.1
diff -c -r fbm/fbext.c ami/fbext.c
*** fbm/fbext.c Sat Mar 3 18:37:19 1990
--- ami/fbext.c Tue May 9 10:13:34 1989
***************
*** 1,5 ****
/*****************************************************************
! * fbext.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
/*****************************************************************
! * fbext.c: FBM Library 0.91 (Beta test) 20-Apr-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 13,25 ****
* [ x y width height ] < foo.fbm > bar.fbm
*
* EDITLOG
! * LastEditDate = Sat May 20 19:03:55 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/fbext.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Bug fix from Dave Cohrs <dave@cs.wisc.edu>
- *
* 20-Apr-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.91) mlm@cs.cmu.edu
*
--- 13,22 ----
* [ x y width height ] < foo.fbm > bar.fbm
*
* EDITLOG
! * LastEditDate = Tue Mar 7 19:56:19 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/fbext.c
*
* HISTORY
* 20-Apr-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.91) mlm@cs.cmu.edu
*
***************
*** 41,47 ****
#ifndef lint
static char *fbmid =
! "$FBM fbext.c <0.94> 20-May-89 (C) 1989 by Michael Mauldin$";
#endif
main (argc, argv)
--- 38,44 ----
#ifndef lint
static char *fbmid =
! "$FBM fbext.c <0.91> 20-Apr-89 (C) 1989 by Michael Mauldin$";
#endif
main (argc, argv)
***************
*** 57,65 ****
input.cm = input.bm = (unsigned char *) NULL;
rotated.cm = rotated.bm = (unsigned char *) NULL;
output.cm = output.bm = (unsigned char *) NULL;
-
- title[0] = '\0';
- credits[0] = '\0';
/* Get the options */
while (--argc > 0 && (*++argv)[0] == '-')
--- 54,59 ----
Only in fbm: fbhalf.1
Only in fbm: fbham.1
Only in fbm: fbham.c
Only in fbm: fbhist.1
Only in fbm: fbinfo.1
diff -c -r fbm/fbinfo.c ami/fbinfo.c
*** fbm/fbinfo.c Sat Mar 3 18:36:55 1990
--- ami/fbinfo.c Tue May 9 10:56:14 1989
***************
*** 46,52 ****
{ for (i=1; i<argc; i++)
{ strcpy (name, argv[i]);
! if (strcmp (name + strlen (name) - 2, ".Z") == 0)
{ sprintf (cmd, "(uncompress < %s | select 0 255) 2> /dev/null", name);
if (infile = popen (cmd, "r"))
{ binfo (name, infile); pclose (infile); }
--- 46,52 ----
{ for (i=1; i<argc; i++)
{ strcpy (name, argv[i]);
! /* if (strcmp (name + strlen (name) - 2, ".Z") == 0)
{ sprintf (cmd, "(uncompress < %s | select 0 255) 2> /dev/null", name);
if (infile = popen (cmd, "r"))
{ binfo (name, infile); pclose (infile); }
***************
*** 53,59 ****
else
{ perror (cmd); }
}
! else if (infile = fopen (argv[i], "r"))
{ binfo (argv[i], infile); fclose (infile); }
else
{ perror (argv[i]); }
--- 53,60 ----
else
{ perror (cmd); }
}
! */
! if (infile = fopen (argv[i], "r"))
{ binfo (argv[i], infile); fclose (infile); }
else
{ perror (argv[i]); }
Only in fbm: fbm.1
Only in fbm: fbm2pod.1
Only in fbm: fbmask.1
Only in fbm: fbnorm.1
Only in fbm: fbps.1
Only in fbm: fbquant.1
diff -c -r fbm/fbquant.c ami/fbquant.c
*** fbm/fbquant.c Sat Mar 3 18:37:33 1990
--- ami/fbquant.c Tue May 9 11:14:48 1989
***************
*** 92,99 ****
--- 92,102 ----
short cnt;
short color;
} PIXEL;
+ PIXEL *box = NULL;
int debug=0, verbose=0, colors=256, showcolor=0, dither=1;
+ short *cache;
+ int **cerr, **lerr;
/****************************************************************
* main
***************
*** 109,115 ****
main (argc, argv)
char *argv[];
{ FBM input, output, mapimage; /* Images */
! int hist[CUBSIZ]; /* Color cube 32x32x32 for histogram */
int outtype = DEF_8BIT; /* Output format desired */
char *mapfile = NULL; /* Name of file to copy map from */
register int c;
--- 112,118 ----
main (argc, argv)
char *argv[];
{ FBM input, output, mapimage; /* Images */
! int *hist; /* Color cube 32x32x32 for histogram */
int outtype = DEF_8BIT; /* Output format desired */
char *mapfile = NULL; /* Name of file to copy map from */
register int c;
***************
*** 119,124 ****
--- 122,128 ----
output.bm = output.cm = (unsigned char *) NULL;
mapimage.bm = mapimage.cm = (unsigned char *) NULL;
+ hist = (int *) malloc((unsigned) CUBSIZ * 4);
/* Get the options */
while (--argc > 0 && (*++argv)[0] == '-')
{ while (*++(*argv))
***************
*** 212,219 ****
/* Write out the result */
if (write_bitmap (&output, stdout, outtype))
! { exit (0); }
exit (1);
}
--- 216,237 ----
/* Write out the result */
if (write_bitmap (&output, stdout, outtype))
! {
! free(cmap);
! free(cerr);
! free(lerr);
! free(box);
! free(hist);
! free(cache);
! exit (0);
! }
+ free(cmap);
+ free(cerr);
+ free(lerr);
+ free(box);
+ free(hist);
+ free(cache);
exit (1);
}
***************
*** 260,269 ****
COLOR *cmap;
int colors;
{ register int i, k;
! PIXEL box[CUBSIZ];
register PIXEL *b;
int used=0, t;
/* Build the first box, encompassing all pixels */
for (b=box, i=0; i<CUBSIZ; i++)
{ b->color = i;
--- 278,288 ----
COLOR *cmap;
int colors;
{ register int i, k;
! PIXEL *box;
register PIXEL *b;
int used=0, t;
+ box = (PIXEL *) malloc((unsigned) CUBSIZ * 4);
/* Build the first box, encompassing all pixels */
for (b=box, i=0; i<CUBSIZ; i++)
{ b->color = i;
***************
*** 750,756 ****
* nearest: Choose nearest color
****************************************************************/
! short cache[CUBSIZ];
init_nearest (cmap, colors)
COLOR *cmap;
--- 769,775 ----
* nearest: Choose nearest color
****************************************************************/
! /* short cache[CUBSIZ]; */
init_nearest (cmap, colors)
COLOR *cmap;
***************
*** 757,762 ****
--- 776,782 ----
int colors;
{ register int i;
+ cache = (short *) malloc((unsigned) CUBSIZ * 2);
/* Initialize the cache */
for (i=0; i<CUBSIZ; i++) { cache[i] = -1; }
Only in fbm: fbrot.1
Only in fbm: fbsample.1
diff -c -r fbm/fbsample.c ami/fbsample.c
*** fbm/fbsample.c Sat Mar 3 18:37:05 1990
--- ami/fbsample.c Wed Mar 29 13:25:40 1989
***************
*** 1,5 ****
/*****************************************************************
! * fbsample.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
/*****************************************************************
! * fbsample.c: FBM Library 0.9 (Beta test) 07-Mar-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 11,23 ****
* % fbsample [ title ] < foo.pbm > foo.fbm
*
* EDITLOG
! * LastEditDate = Sat May 20 19:05:33 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/fbsample.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Bug fix from Dave Cohrs <dave@cs.wisc.edu>
- *
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
--- 11,20 ----
* % fbsample [ title ] < foo.pbm > foo.fbm
*
* EDITLOG
! * LastEditDate = Tue Mar 7 19:56:43 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/fbsample.c
*
* HISTORY
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
***************
*** 37,43 ****
#ifndef lint
static char *fbmid =
! "$FBM fbsample.c <0.94> 20-May-89 (C) 1989 by Michael Mauldin$";
#endif
main(argc, argv)
--- 34,40 ----
#ifndef lint
static char *fbmid =
! "$FBM fbsample.c <0.9> 07-Mar-89 (C) 1989 by Michael Mauldin$";
#endif
main(argc, argv)
***************
*** 121,127 ****
output.hdr.rowlen = orow;
output.hdr.plnlen = orow * height;
output.hdr.aspect = 1.0;
- output.hdr.clrlen = 0;
if (title) strcpy (output.hdr.title, title);
if (credits) strcpy (output.hdr.credits, credits);
--- 118,123 ----
Only in fbm: fbsharp.1
diff -c -r fbm/flblue.c ami/flblue.c
*** fbm/flblue.c Sat Mar 3 18:37:14 1990
--- ami/flblue.c Fri Mar 31 23:19:00 1989
***************
*** 1,5 ****
/*****************************************************************
! * flblue.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
/*****************************************************************
! * flblue.c: FBM Library 0.9 (Beta test) 07-Mar-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 11,23 ****
* bluenoise_fbm (input, output, noiselevel)
*
* EDITLOG
! * LastEditDate = Sat May 20 19:06:08 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flblue.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Bug fix from Dave Cohrs <dave@cs.wisc.edu>
- *
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
--- 11,20 ----
* bluenoise_fbm (input, output, noiselevel)
*
* EDITLOG
! * LastEditDate = Tue Mar 7 19:56:47 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flblue.c
*
* HISTORY
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
***************
*** 45,51 ****
#ifndef lint
static char *fbmid =
! "$FBM flblue.c <0.94> 20-May-89 (C) 1989 by Michael Mauldin$";
#endif
bluenoise_fbm (input, output, noiselevel)
--- 42,48 ----
#ifndef lint
static char *fbmid =
! "$FBM flblue.c <0.9> 07-Mar-89 (C) 1989 by Michael Mauldin$";
#endif
bluenoise_fbm (input, output, noiselevel)
***************
*** 71,77 ****
output->hdr.physbits = 8;
outrow = 16 * ((input->hdr.cols + 15) / 16); /* Pad to even byte boundary */
output->hdr.rowlen = outrow;
- output->hdr.plnlen = outrow*output->hdr.rows;
alloc_fbm (output);
w = input->hdr.cols;
--- 68,73 ----
***************
*** 210,214 ****
--- 206,212 ----
eerr[w-1] = INITERR (bmp[w-1], obm[w-1]);
}
}
+ free(eerr);
+ free(oerr);
return (1);
}
diff -c -r fbm/flbyte.c ami/flbyte.c
*** fbm/flbyte.c Sat Mar 3 18:37:05 1990
--- ami/flbyte.c Wed Mar 29 13:26:10 1989
***************
*** 1,5 ****
/*****************************************************************
! * flbyte.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
/*****************************************************************
! * flbyte.c: FBM Library 0.9 (Beta test) 07-Mar-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 18,30 ****
* LITTLE lsb first (Vax, 6502)
*
* EDITLOG
! * LastEditDate = Sat May 20 19:11:04 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flbyte.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Bug fix from Dave Cohrs <dave@cs.wisc.edu>
- *
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
--- 18,27 ----
* LITTLE lsb first (Vax, 6502)
*
* EDITLOG
! * LastEditDate = Tue Mar 7 19:56:49 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flbyte.c
*
* HISTORY
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
***************
*** 134,145 ****
****************************************************************/
machine_byte_order ()
! { short testshort;
! char *teststr = (char*) &testshort;
! teststr[0] = '\1'; teststr[1] = '\0';
!
! if (testshort == 1)
{ return (LITTLE); }
else
{ return (BIG); }
--- 131,140 ----
****************************************************************/
machine_byte_order ()
! { char *teststr = "\001\000";
! short *testshort = (short *) teststr;
! if (*testshort == 1)
{ return (LITTLE); }
else
{ return (BIG); }
diff -c -r fbm/flcavg.c ami/flcavg.c
*** fbm/flcavg.c Sat Mar 3 18:36:58 1990
--- ami/flcavg.c Wed Mar 29 13:26:16 1989
***************
*** 1,5 ****
/*****************************************************************
! * flcavg.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
/*****************************************************************
! * flcavg.c: FBM Library 0.9 (Beta test) 07-Mar-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 11,23 ****
* constravg_fbm (input, output, gamma)
*
* EDITLOG
! * LastEditDate = Sat May 20 19:07:06 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flcavg.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Bug fix from Dave Cohrs <dave@cs.wisc.edu>
- *
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
--- 11,20 ----
* constravg_fbm (input, output, gamma)
*
* EDITLOG
! * LastEditDate = Tue Mar 7 19:56:50 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flcavg.c
*
* HISTORY
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
***************
*** 39,45 ****
#ifndef lint
static char *fbmid =
! "$FBM flcavg.c <0.94> 20-May-89 (C) 1989 by Michael Mauldin$";
#endif
constravg_fbm (input, output, gamma)
--- 36,42 ----
#ifndef lint
static char *fbmid =
! "$FBM flcavg.c <0.9> 07-Mar-89 (C) 1989 by Michael Mauldin$";
#endif
constravg_fbm (input, output, gamma)
***************
*** 62,68 ****
output->hdr.physbits = 8;
outrow = 16 * ((input->hdr.cols + 15) / 16); /* Pad to even byte boundary */
output->hdr.rowlen = outrow;
- output->hdr.plnlen = outrow*output->hdr.rows;
alloc_fbm (output);
w = input->hdr.cols;
--- 59,64 ----
diff -c -r fbm/fledge.c ami/fledge.c
*** fbm/fledge.c Sat Mar 3 18:37:21 1990
--- ami/fledge.c Fri Mar 31 23:42:14 1989
***************
*** 353,356 ****
--- 353,357 ----
}
}
}
+ free(gray);
}
diff -c -r fbm/flflyd.c ami/flflyd.c
*** fbm/flflyd.c Sat Mar 3 18:37:07 1990
--- ami/flflyd.c Fri Mar 31 23:46:22 1989
***************
*** 1,5 ****
/*****************************************************************
! * flflyd.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
/*****************************************************************
! * flflyd.c: FBM Library 0.9 (Beta test) 07-Mar-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 11,23 ****
* floyd_fbm (input, output)
*
* EDITLOG
! * LastEditDate = Sat May 20 19:13:12 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flflyd.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Bug fix from Dave Cohrs <dave@cs.wisc.edu>
- *
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
--- 11,20 ----
* floyd_fbm (input, output)
*
* EDITLOG
! * LastEditDate = Tue Mar 7 19:57:07 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flflyd.c
*
* HISTORY
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
***************
*** 43,49 ****
#ifndef lint
static char *fbmid =
! "$FBM flflyd.c <0.94> 20-May-89 (C) 1989 by Michael Mauldin$";
#endif
floyd_fbm (input, output)
--- 40,46 ----
#ifndef lint
static char *fbmid =
! "$FBM flflyd.c <0.9> 07-Mar-89 (C) 1989 by Michael Mauldin$";
#endif
floyd_fbm (input, output)
***************
*** 67,73 ****
output->hdr.physbits = 8;
outrow = 16 * ((input->hdr.cols + 15) / 16); /* Pad to even byte boundary */
output->hdr.rowlen = outrow;
- output->hdr.plnlen = outrow*output->hdr.rows;
alloc_fbm (output);
w = input->hdr.cols;
--- 64,69 ----
***************
*** 156,160 ****
--- 152,158 ----
terr = lerr; lerr = cerr; cerr = terr;
}
+ free(lerr);
+ free(cerr);
return (1);
}
diff -c -r fbm/flklnr.c ami/flklnr.c
*** fbm/flklnr.c Sat Mar 3 18:37:22 1990
--- ami/flklnr.c Wed Mar 29 13:28:26 1989
***************
*** 117,123 ****
for (i=0; i<w; i++)
{ sum = 0;
! cnt =X
/* Set limits of neighborhood */
left = i-off; if (left < 0) left = 0;
right = left+nbr; if (right > w) right = w;
--- 117,124 ----
for (i=0; i<w; i++)
{ sum = 0;
! cnt = 0;
!
/* Set limits of neighborhood */
left = i-off; if (left < 0) left = 0;
right = left+nbr; if (right > w) right = w;
diff -c -r fbm/flpcx.c ami/flpcx.c
*** fbm/flpcx.c Sat Mar 3 18:37:27 1990
--- ami/flpcx.c Fri Mar 31 23:55:26 1989
***************
*** 259,264 ****
--- 259,265 ----
{ fprintf (stderr, "Read %d planes successfully\n", depth);
}
+ free(buf);
return (1);
}
diff -c -r fbm/flread.c ami/flread.c
*** fbm/flread.c Sat Mar 3 18:37:09 1990
--- ami/flread.c Wed Mar 29 14:34:06 1989
***************
*** 63,69 ****
peekch = fgetc (rfile);
/* If the image is compressed, uncompress it while reading */
! if (peekch == COMPRESSED_CHAR)
{ if (rfile == stdin)
{ if (lseek (fileno (rfile), 0L, 0) < 0) perror ("lseek");
rfile = popen ("uncompress", "r");
--- 63,69 ----
peekch = fgetc (rfile);
/* If the image is compressed, uncompress it while reading */
! /* if (peekch == COMPRESSED_CHAR)
{ if (rfile == stdin)
{ if (lseek (fileno (rfile), 0L, 0) < 0) perror ("lseek");
rfile = popen ("uncompress", "r");
***************
*** 77,83 ****
peekch = fgetc (rfile);
}
!
magic[0] = peekch;
mlen = 1;
--- 77,83 ----
peekch = fgetc (rfile);
}
! */
magic[0] = peekch;
mlen = 1;
***************
*** 97,104 ****
default: fprintf (stderr, "Unknown magic char %03o\n", peekch);
}
! if (do_pclose) pclose (rfile);
! else fclose (rfile);
return (result);
}
--- 97,104 ----
default: fprintf (stderr, "Unknown magic char %03o\n", peekch);
}
! /* if (do_pclose) pclose (rfile); else */
! fclose (rfile);
return (result);
}
diff -c -r fbm/flshrp.c ami/flshrp.c
*** fbm/flshrp.c Sat Mar 3 18:37:18 1990
--- ami/flshrp.c Fri Mar 31 23:59:50 1989
***************
*** 199,203 ****
--- 199,204 ----
}
}
+ free(gray);
return (1);
}
diff -c -r fbm/flsun.c ami/flsun.c
*** fbm/flsun.c Sat Mar 3 18:37:23 1990
--- ami/flsun.c Tue May 9 10:18:46 1989
***************
*** 1,5 ****
/*****************************************************************
! * flsun.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
/*****************************************************************
! * flsun.c: FBM Library 0.9 (Beta test) 07-Mar-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 12,24 ****
* write_sun (image, wfile)
*
* EDITLOG
! * LastEditDate = Sat May 20 19:08:32 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flsun.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Fixed problem with odd length rows on reading
- *
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
--- 12,21 ----
* write_sun (image, wfile)
*
* EDITLOG
! * LastEditDate = Thu Apr 20 16:53:36 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flsun.c
*
* HISTORY
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
diff -c -r fbm/fltga.c ami/fltga.c
*** fbm/fltga.c Sat Mar 3 18:37:28 1990
--- ami/fltga.c Tue May 9 10:19:02 1989
***************
*** 12,19 ****
* write_tga (image, wfile)
*
* EDITLOG
! * LastEditDate = Sat May 20 19:53:58 1989 - Michael Mauldin
! * LastFileName = /usr2/mlm/src/misc/fbm/fltga.c
*
* HISTORY
* 03-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
--- 12,19 ----
* write_tga (image, wfile)
*
* EDITLOG
! * LastEditDate = Wed May 3 22:03:33 1989 - Michael Mauldin
! * LastFileName = /usr2/mlm/src/misc/fbm/fbcat.c
*
* HISTORY
* 03-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
diff -c -r fbm/flthre.c ami/flthre.c
*** fbm/flthre.c Sat Mar 3 18:36:59 1990
--- ami/flthre.c Wed Mar 29 13:29:38 1989
***************
*** 1,5 ****
! 1/*****************************************************************
! * flthre.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
! /*****************************************************************
! * flthre.c: FBM Library 0.9 (Beta test) 07-Mar-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 11,23 ****
* thesh_fbm (input, output, thresh)
*
* EDITLOG
! * LastEditDate = Sat May 20 19:06:37 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flthre.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Bug fix from Dave Cohrs <dave@cs.wisc.edu>
- *
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
--- 11,20 ----
* thesh_fbm (input, output, thresh)
*
* EDITLOG
! * LastEditDate = Tue Mar 7 19:57:34 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/flthre.c
*
* HISTORY
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
***************
*** 39,45 ****
#ifndef lint
static char *fbmid =
! "$FBM flthre.c <0.94> 20-May-89 (C) 1989 by Michael Mauldin$";
#endif
thesh_fbm (input, output, thresh)
--- 36,42 ----
#ifndef lint
static char *fbmid =
! "$FBM flthre.c <0.9> 07-Mar-89 (C) 1989 by Michael Mauldin$";
#endif
thesh_fbm (input, output, thresh)
***************
*** 62,68 ****
output->hdr.physbits = 8;
outrow = 16 * ((input->hdr.cols + 15) / 16); /* Pad to even byte boundary */
output->hdr.rowlen = outrow;
- output->hdr.plnlen = outrow*output->hdr.rows;
alloc_fbm (output);
w = input->hdr.cols;
--- 59,64 ----
Only in fbm: gray2clr.1
Only in fbm: idiff.1
Only in ami: makefile
Only in fbm: part01
Only in fbm: part02
Only in fbm: part03
Only in fbm: part04
Only in fbm: part05
Only in fbm: part06
Only in fbm: part07
Only in fbm: part08
Only in fbm: pbm2ps.1
Only in fbm: pbmtitle.1
Only in fbm: qrt2fbm.1
Only in fbm: raw2fbm.1
diff -c -r fbm/raw2fbm.c ami/raw2fbm.c
*** fbm/raw2fbm.c Sat Mar 3 18:37:09 1990
--- ami/raw2fbm.c Sat Apr 1 00:37:20 1989
***************
*** 1,5 ****
/*****************************************************************
! * raw2fbm.c: FBM Library 0.94 (Beta test) 20-May-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
--- 1,5 ----
/*****************************************************************
! * raw2fbm.c: FBM Library 0.9 (Beta test) 07-Mar-89 Michael Mauldin
*
* Copyright (C) 1989 by Michael Mauldin. Permission is granted to
* use this file in whole or in part provided that you do not sell it
***************
*** 16,28 ****
* -d'<planes> < rawfile > fbm
*
* EDITLOG
! * LastEditDate = Sat May 20 19:07:44 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/raw2fbm.c
*
* HISTORY
- * 20-May-89 Michael Mauldin (mlm) at Carnegie Mellon University
- * Bug fix from Dave Cohrs <dave@cs.wisc.edu>
- *
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
--- 16,25 ----
* -d'<planes> < rawfile > fbm
*
* EDITLOG
! * LastEditDate = Tue Mar 7 19:57:50 1989 - Michael Mauldin
* LastFileName = /usr2/mlm/src/misc/fbm/raw2fbm.c
*
* HISTORY
* 07-Mar-89 Michael Mauldin (mlm) at Carnegie Mellon University
* Beta release (version 0.9) mlm@cs.cmu.edu
*
***************
*** 39,45 ****
#ifndef lint
static char *fbmid =
! "$FBM raw2fbm.c <0.94> 20-May-89 (C) 1989 by Michael Mauldin$";
#endif
main (argc, argv)
--- 36,42 ----
#ifndef lint
static char *fbmid =
! "$FBM raw2fbm.c <0.9> 07-Mar-89 (C) 1989 by Michael Mauldin$";
#endif
main (argc, argv)
***************
*** 51,59 ****
unsigned char *buf;
char title[FBM_MAX_TITLE], credits[FBM_MAX_TITLE];
- title[0] = '\0';
- credits[0] = '\0';
-
/* Get the options */
while (--argc > 0 && (*++argv)[0] == '-')
{ while (*++(*argv))
--- 48,53 ----
***************
*** 127,131 ****
--- 121,126 ----
}
}
+ free(buf);
exit (0);
}